Add support for a custom arguments list when running main.

diff --git a/src/cargo/lib.rs b/src/cargo/lib.rs
index e2b99336e63dc850cf33ce3e559c632ffc307fcd..2dd20824f90d279485deff16d65ced0953c942a4 100644 (file)
--- a/src/cargo/lib.rs
+++ b/src/cargo/lib.rs
@@ -116,6 +116,20 @@ pub fn execute_main_without_stdin<'a,
                                                        options_first));
 }
 
+pub fn execute_main_with_args_and_without_stdin<'a,
+                                  T: Decodable<docopt::Decoder, docopt::Error>,
+                                  V: Encodable<json::Encoder<'a>, io::IoError>>(
+                                      exec: fn(T, &mut MultiShell) -> CliResult<Option<V>>,
+                                      options_first: bool,
+                                      usage: &str,
+                                      args: &[String]) {
+    let mut shell = shell(true);
+
+    process_executed(
+        call_main_without_stdin(exec, &mut shell, usage, args, options_first),
+        &mut shell)
+}
+
 pub fn call_main_without_stdin<'a,
                                T: Decodable<docopt::Decoder, docopt::Error>,
                                V: Encodable<json::Encoder<'a>, io::IoError>>(

diff --git a/src/cargo/sources/path.rs b/src/cargo/sources/path.rs
index 731e4835e5811f5921849fb4cb68c500dda85828..d6a012fc571db8b24ee9c19878cdedcd3a72a40e 100644 (file)
--- a/src/cargo/sources/path.rs
+++ b/src/cargo/sources/path.rs
@@ -51,7 +51,7 @@ impl PathSource {
         }
     }
 
-    fn read_packages(&self) -> CargoResult<Vec<Package>> {
+    pub fn read_packages(&self) -> CargoResult<Vec<Package>> {
         if self.updated {
             Ok(self.packages.clone())
         } else {